merge trunk
authorK. Handa <handa@gnu.org>
Mon, 8 Jul 2013 11:55:58 +0000 (20:55 +0900)
committerK. Handa <handa@gnu.org>
Mon, 8 Jul 2013 11:55:58 +0000 (20:55 +0900)
commitd69e009b98209918a6de7ae207812c59d5d1ebaa
treeb4e4df38fc20b0be5722ea3d6e50eb3f496fff50
parent820c47928dc2411194cf8686edb297dd8d264ee4
parent0e72a139c1b2d86d4666a720ca764589c68c3a68
merge trunk